From: Florian Müllner Date: Wed, 1 Feb 2023 12:21:08 +0000 (+0100) Subject: st/icon-theme: Merge private header X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~405^2^2~117 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6607bf0928240bdcfa4a1286563f59054310b5d2;p=gnome-shell.git st/icon-theme: Merge private header GtkIconTheme's headers are split between a public and a private one. We won't expose the icon theme API at all, nor do we need to access anything beyond what the texture cache is currently using, so merge the private header into the implementation. Part-of: --- diff --git a/src/st/st-icon-theme-private.h b/src/st/st-icon-theme-private.h deleted file mode 100644 index 8a32cc511..000000000 --- a/src/st/st-icon-theme-private.h +++ /dev/null @@ -1,41 +0,0 @@ -/* GTK - The GIMP Toolkit - * Copyright (C) 2015 Benjamin Otte - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#ifndef __GTK_ICON_THEME_PRIVATE_H__ -#define __GTK_ICON_THEME_PRIVATE_H__ - -#include "st-icon-theme.h" -#include - -void gtk_icon_theme_lookup_symbolic_colors (GtkCssStyle *style, - GdkRGBA *color_out, - GdkRGBA *success_out, - GdkRGBA *warning_out, - GdkRGBA *error_out); - -GtkIconInfo *gtk_icon_info_new_for_file (GFile *file, - gint size, - gint scale); - -GdkPixbuf * gtk_icon_theme_color_symbolic_pixbuf (GdkPixbuf *symbolic, - const GdkRGBA *fg_color, - const GdkRGBA *success_color, - const GdkRGBA *warning_color, - const GdkRGBA *error_color); - - -#endif /* __GTK_ICON_THEME_PRIVATE_H__ */ diff --git a/src/st/st-icon-theme.c b/src/st/st-icon-theme.c index 87cd907ff..b99ab7420 100644 --- a/src/st/st-icon-theme.c +++ b/src/st/st-icon-theme.c @@ -38,7 +38,7 @@ #include "win32/gdkwin32.h" #endif /* G_OS_WIN32 */ -#include "st-icon-theme-private.h" +#include "st-icon-theme.h" #include "gtkcsspalettevalueprivate.h" #include "gtkcssrgbavalueprivate.h" #include "gtkdebug.h" @@ -354,6 +354,9 @@ static IconSuffix theme_dir_get_icon_suffix (IconThemeDir *dir, static GtkIconInfo *icon_info_new (IconThemeDirType type, gint dir_size, gint dir_scale); +static GtkIconInfo *gtk_icon_info_new_for_file (GFile *file, + gint size, + gint scale); static GtkIconInfo *icon_info_new_builtin (BuiltinIcon *icon); static IconSuffix suffix_from_name (const gchar *name); static BuiltinIcon *find_builtin_icon (const gchar *icon_name, @@ -4467,12 +4470,12 @@ rgba_to_pixel(const GdkRGBA *rgba, pixel[3] = 255; } -GdkPixbuf * -gtk_icon_theme_color_symbolic_pixbuf (GdkPixbuf *symbolic, - const GdkRGBA *fg_color, - const GdkRGBA *success_color, - const GdkRGBA *warning_color, - const GdkRGBA *error_color) +static GdkPixbuf * +color_symbolic_pixbuf (GdkPixbuf *symbolic, + const GdkRGBA *fg_color, + const GdkRGBA *success_color, + const GdkRGBA *warning_color, + const GdkRGBA *error_color) { int width, height, x, y, src_stride, dst_stride; guchar *src_data, *dst_data; @@ -4582,11 +4585,11 @@ gtk_icon_info_load_symbolic_png (GtkIconInfo *icon_info, return NULL; } - return gtk_icon_theme_color_symbolic_pixbuf (icon_info->pixbuf, - fg ? fg : &fg_default, - success_color ? success_color : &success_default, - warning_color ? warning_color : &warning_default, - error_color ? error_color : &error_default); + return color_symbolic_pixbuf (icon_info->pixbuf, + fg ? fg : &fg_default, + success_color ? success_color : &success_default, + warning_color ? warning_color : &warning_default, + error_color ? error_color : &error_default); } static GdkPixbuf * @@ -4862,7 +4865,7 @@ gtk_icon_info_load_symbolic (GtkIconInfo *icon_info, error); } -void +static void gtk_icon_theme_lookup_symbolic_colors (GtkCssStyle *style, GdkRGBA *color_out, GdkRGBA *success_out, @@ -5754,7 +5757,7 @@ gtk_icon_info_new_for_pixbuf (GtkIconTheme *icon_theme, return info; } -GtkIconInfo * +static GtkIconInfo * gtk_icon_info_new_for_file (GFile *file, gint size, gint scale)